extensionUtils: Load user extensions before system extensions

https://bugzilla.gnome.org/show_bug.cgi?id=673613

diff --git a/js/misc/extensionUtils.js b/js/misc/extensionUtils.js
index 1697c460934de20f23fd008d5f8fa66247cf4eee..7dcf166de7a937ee33a3f6d91e080747b076c3c7 100644 (file)
--- a/js/misc/extensionUtils.js
+++ b/js/misc/extensionUtils.js
@@ -184,11 +184,11 @@ function scanExtensionsInDirectory(callback, dir, type) {
 
 function scanExtensions(callback) {
     let systemDataDirs = GLib.get_system_data_dirs();
+    scanExtensionsInDirectory(callback, userExtensionsDir, ExtensionType.PER_USER);
     for (let i = 0; i < systemDataDirs.length; i++) {
         let dirPath = GLib.build_filenamev([systemDataDirs[i], 'gnome-shell', 'extensions']);
         let dir = Gio.file_new_for_path(dirPath);
         if (dir.query_exists(null))
             scanExtensionsInDirectory(callback, dir, ExtensionType.SYSTEM);
     }
-    scanExtensionsInDirectory(callback, userExtensionsDir, ExtensionType.PER_USER);
 }